auto merge of #558 : alexcrichton/cargo/issue-553, r=brson
authorbors <bors@rust-lang.org>
Mon, 15 Sep 2014 19:13:42 +0000 (19:13 +0000)
committerbors <bors@rust-lang.org>
Mon, 15 Sep 2014 19:13:42 +0000 (19:13 +0000)

Trivial merge